[automerger skipped] Import translations. DO NOT MERGE am: 943d60667a -s ours
am: 9ff03058a4 -s ours
am skip reason: subject contains skip directive

Change-Id: I33885c17e3b416594b65335f58cc4d7469bcc1a5