Merge "DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2 am: a0263a9909 am: a3b851d352  -s ours am: f52501d2d4  -s ours am: cbb7b8c7a4 am: c666ebef33 am: 1e1974705b  -s ours am: c7824b3de3 am: 0b2c2b2a8c am: b281795c12 am: 17414d65fa  -s ours am: 4ce343881c am: 8aa4a84bc8" into nyc-mr1-dev-plus-aosp