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

Change-Id: Iea5bddbe0b0dfb01080363bf6d83325dcb178e6b