[automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours am: acd8a48b6c -s ours
am: 0a4c821751 -s ours
am skip reason: subject contains skip directive

Change-Id: I89dda01cb409f7eba0d8e31e8ef76baf22bc9a87