Merge "DO NOT MERGE revert system api loadSafeLabel" into mnc-dev