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

Change-Id: Ifd66f13f6b1384eae3f3697b7ac275c442386e0c