[automerger skipped] Import translations. DO NOT MERGE am: 678feaf43a -s ours
am: 05ab24825c -s ours
am skip reason: subject contains skip directive

Change-Id: I9155921f2e77628f6726fd46ccb0d58570b231b0