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

Change-Id: Iec1b837215cf09e1904287f9eee0082fa4f00097