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

Change-Id: I733cc2b3421780398a2a764748c9d9155c39327b