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

Change-Id: If1a5d01375b2a4e503ddf93bba5e009754889d44