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

Change-Id: I59d7f37f52a213156d99a5ede38aa832016dee2a