Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 57c60d3b8c  -s ours
am: ac2abee039  -s ours

Change-Id: If0b55bb356eb9958d8b036ddb4ff70d178c64355