[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 9d83a7b1a1 -s ours am: 4ade706df0 -s ours am: aae38beb23 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic23887bcbe4aa5e6a845e1c39f5f14fd8296b997