Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 2fb78bafc7  -s ours
am: 4a4b0e5726  -s ours

Change-Id: Id36ca27107f7250850ff5c2004a70b55fb206c31