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

Change-Id: I9cf422645c4688ecf0643334b4fa3e20e66af51e