Merge \\\\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\\\" into...

Merge \\\\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\\\" into mnc-dev am: d2e2288f am: 59fc7688 am: 69a071e5 am: e5643a13  -s ours am: ea5f6a74 am: fb55beef
am: ced2efec  -s ours

Change-Id: Ie7c6e3bad56d3a6252aeae968469b25c44baf235