[automerger skipped] Import translations. DO NOT MERGE am: 3c7cd66c75 -s ours am: c94b6552a2 -s ours
am: 43bde0770c -s ours
am skip reason: subject contains skip directive

Change-Id: I03ddf0d163a3eb90ab3f453d5bb8b80c2be624f2