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