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

Change-Id: I1eeb704e6b0a29e3574e969649ba72bbb5d9a9c2