DO NOT MERGE revert system api loadSafeLabel
am: 863ac471cf

Change-Id: I9230b78b2e1ac29cfd76db00be0c31e690566ac7