DO NOT MERGE revert system api loadSafeLabel am: 863ac471 am: 92b8cbd4 am: b4849f8d -s ours am: d061c3ab am: f6923d29 Change-Id: If22f635f2e4cf0a3ce79ef6916abe3cb60c6b419