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

Change-Id: I57c8b921cf49a36adab1bc7b234427c02f1c3337