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

Change-Id: I2282f0ab89638dce50ed3c6b3ad66604bfe4c1ee