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

Change-Id: Id08d6339706794b2ea849de8285f0882e1a31d75