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

Change-Id: I372f1f65bc2d9918eb6d04c74d0c792516be484c