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

Change-Id: I914f9b17db4d515a8d962abb876a2847d2fab6b3