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
Change-Id: I8ad481e7867d3684029be6b1fc87ec3d19711e79