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