Merge \\\"DO NOT MERGE revert system api loadSafeLabel\\\" into mnc-dev am: d2e2288f am: 59fc7688 am: 69a071e5 Change-Id: If59d61dfdc00f740ffcf8fbe5233b191eb03a797