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

Merge \"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: b683dab1\" into nyc-mr1-dev-plus-aosp
am: 3f8ddcf0  -s ours

Change-Id: I20fcfea2a392873ecf1f8e0b179a23fdf8a3c2cd