Merge "API: Supress existing inconsistent Context service names" am: 3b35f3dfef am: 72bb1fa6c2

Change-Id: Iefaa20526372406ecd043c5b4b3895a98163fcb7