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

Change-Id: I135d93838a61fad0211b23aaf5b3b48ef40926b5