[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 1623c3c1bd -s ours am: 4d05b1741c -s ours
am skip reason: subject contains skip directive

Change-Id: I1739a832e8b530e8781c4c0b0cc3c2df934e633d