Merge \\\"DO NOT MERGE add private function converSafeLabel\\\" into lmp-dev am: 18d33742 -s ours am: dffa158e am: 7e3c00dd Change-Id: I2e92901bd11d14a84adae02aac647f990d6d0c7c