Merge \"Merge \\\\\\\\\\\"DO NOT MERGE add private function...

Merge \"Merge \\\\\\\\\\\"DO NOT MERGE add private function converSafeLabel\\\\\\\\\\\" into lmp-dev am: 18d33742  -s ours am: dffa158e am: 7e3c00dd am: e09a832a  -s ours am: c9a35ad0 am: 3f2d5d24 am: 57a5d3b0 am: 4f3a1918  -s ours am: 60af59ca am: a0a84347\" into nyc-mr1-dev-plus-aosp
am: e844c99a  -s ours

Change-Id: I6f3b3b5b580eca2adc5fb336e5dd037c5ae951fd