Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 2fb78bafc7  -s ours" into oc-dr1-dev-plus-aosp
am: fba5a5bad9  -s ours

Change-Id: I7fa39b07454bda35ecc325fe9910104a5761da81