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

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

Change-Id: I7a010f957438467d2edfb10a28a364527dac492e