[automerger skipped] Import translations. DO NOT MERGE am: 20ea9e8b67 -s ours
am: 0d7c912e77 -s ours
am skip reason: subject contains skip directive

Change-Id: I4a1715682a35a4a3f4d3f57bb79d66939be3a3fb