[automerger skipped] Merge "Import translations. DO NOT MERGE"
am: 05d99cea0e -s ours
am skip reason: subject contains skip directive

Change-Id: I0687296c646071314b3aaceabb3086f5857be740