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

Change-Id: I8de53f5fa9e45bb5b39eb9d2cd3901f49850e93f