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

Change-Id: I4ae23825fcef45856aa8551725c38fba0dd4892a