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

Change-Id: I93d19a74fc2194b7f088069e3b89a9a28917e54a