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

Change-Id: I9341a1e79f59321a5f7ae9729f4a90d9f262731e