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: 2f97448c
Change-Id: Ibf4dbd83a38e4c40eff725b2e0686829bf18ffed