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

Change-Id: I181876ca8f124875296af5c91d90788d44e6e690