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

Change-Id: I4a776102e1ecdfc0da70e0a6a91f0b49e5854edc