Merge "DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74  -s ours am: d061c3abfa am: f6923d2993 am: 50904bedb5 am: aad33e6905  -s ours am: c8a7fd0502 am: 8e71c857ff" into nyc-mr1-dev-plus-aosp