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

Change-Id: I3b749db0e748344dad59f8d9487525320f516bb2