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

Change-Id: I2076be4bf62ef1b354e5e30ff001a80404ecc127