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

Change-Id: I8b40b7fbf1c6b2e9fa556c6fc31d81b98e291fdf