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 am: 21f63fd7
Change-Id: I094c1a57d7f0a899da9434742a5fa2bc26950534