Merge "Remove trailing 'F's in IccId when quering sub database with it" into...
Merge "Remove trailing 'F's in IccId when quering sub database with it" into rvc-dev am: a9b113cf am: 06899aaf am: a2b08413 am: 1efc1886
Change-Id: Idfd8518a4654f40c19d22429b1b222f2a5cea4b1