DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2 am: a0263a9909 am: a3b851d352  -s ours am: f52501d2d4  -s ours
am: cbb7b8c7a4

Change-Id: Iad9b7ca53c003319a89dc3b7091bbbafb94a95dd