[automerger skipped] Merge "Import translations. DO NOT MERGE" am: f2678d3bc1 -s ours am: 1543741a0e -s ours am: 5aebd88581 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibc2ac4e0d68212697fb5e5937e1a0fb4ce1662c4