Merge \\\\\\\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\\\\\\"...

Merge \\\\\\\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\\\\\\" into lmp-dev am: 521efcd1  -s ours am: 7bd0eea9 am: 0828455c am: caabaab8  -s ours am: 67f8e822 am: f82ca1f3 am: 0f741391 am: 4000bdb3  -s ours am: 1d5fbe43 am: cdbd5f7f
am: b8b3fda1  -s ours

Change-Id: Ifc03ab320ed06e08382dbb2ab1ef67435997bfd0