Merge "Import translations. DO NOT MERGE am: 87c4d55ccb  -s ours am: e3dff12f80  -s ours" into oc-mr1-dev-plus-aosp
am: fcf1647e85  -s ours

Change-Id: I350c6e0c676f72c3a19ce8b5aef6700cc3634ee5