[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 911eb7a414 -s ours am: 2dc9a569df -s ours
am skip reason: subject contains skip directive

Change-Id: I1070bf75c08c4461e587d38488d0433f050dbf91