DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472
am: b4849f8d74  -s ours

Change-Id: Id3089485c93309a4d1ee97e12aeda63c015f397a