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

Change-Id: I9d7c8b82110069ff380ac137fb82b82a26627d45