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

Change-Id: Ic856cb8ca560d42fae8f1b6499716300f39218c8