Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 51e35963ae  -s ours" into oc-mr1-dev
am: e3f6e69af1  -s ours

Change-Id: Ib0bc3bdae13c6af93d0841744c60a49c8152f255