[automerger skipped] Merge "Import translations. DO NOT MERGE"
am: d01f664cae  -s ours

Change-Id: Ia12ae9d3a41efabfeb34adae7bddc21296bbcd0b