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: 5279e9e2 am: a9a921e4 am: 62aa0da0
Change-Id: I2e1e708ce86d7d8bfb5377fa64a6f115e0967f77