[automerger skipped] Import translations. DO NOT MERGE am: 6e879a95b2 -s ours am: 7ec1927fcb -s ours

am skip reason: subject contains skip directive

Change-Id: Ib6cea3bc91e0e825852c17962c0c5792ea28d748