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

Change-Id: Ia6af0a650e4fe0afdcf56ecee7473be2cdef7b32