Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 51e35963ae  -s ours am: 85de7f20ab  -s ours" into oc-mr1-dev-plus-aosp
am: e6eba20c15  -s ours

Change-Id: I459f59c35e70c0bbbb00a6a12c14204afc5af499