Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 4b7b89b9a1  -s ours

Change-Id: I57dae4e6dda7c007c9571d415b3e3e0aa332a753