Merge "Import translations. DO NOT MERGE am: 6cf2d99816
-s ours am: cc298f9ae6
-s ours" into oc-dr1-dev-plus-aosp
am: 8746483a7c
-s ours
Change-Id: I5a0e57de40ded32e9207c4ac0e5e85e89d2fde1f
This commit is contained in: