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

Change-Id: Idfb4e5bd9d7a86867f0a8a3020d437db50eee42c