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

Change-Id: I6b5cbb464105136e6cdaacd6a971232dfb837edd