DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2
am: a0263a9909

Change-Id: Iff18193574eeac7e9d0033025a4fff791ba9ccaa