Merge \"DO NOT MERGE revert public api loadSafeLabel\" into lmp-dev
am: 521efcd1e3  -s ours

Change-Id: I278455eb32488b221de93acd52b64956149cad54