Merge "Import translations. DO NOT MERGE am: e0fec63824 -s ours am: 156955898f -s ours" into oc-mr1-dev-plus-aosp
am: d194882e52 -s ours
Change-Id: I248f8cb34b25aa17e66f5d26d12394f14a773376
This commit is contained in: