Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 8f8d12fd45  -s ours

Change-Id: Ie47abeedb1819215b3d4938ac3a5002a42f7a5d7