[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 0b172415fd -s ours am: 440d03ede2 -s ours
am: b5937efb0d -s ours
am skip reason: subject contains skip directive

Change-Id: I3692dbb4a164e9d483c8117ff0e608db344d5205