Merge \\\"DO NOT MERGE revert public api loadSafeLabel\\\" into lmp-dev am:...
Merge \\\"DO NOT MERGE revert public api loadSafeLabel\\\" into lmp-dev am: 521efcd1 -s ours am: 7bd0eea9
am: 0828455c
Change-Id: Ie1d5e38af7c3c49eb69f61e379096b17dd004961