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

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

Change-Id: I025b6275b7a36688452903e25fe48fc39c0b0b69