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

Change-Id: Ic7273eacff5b1a24b1cf309799155c816a3ed6d7