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

Change-Id: I2ca8a734fbcaf1860e39df6cdb4cdad0e065f5ea