Merge \\\"DO NOT MERGE revert system api loadSafeLabel\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893
am: 69a071e55c

Change-Id: If59d61dfdc00f740ffcf8fbe5233b191eb03a797