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

Change-Id: Ie2fb8eaa3d8200f63340cb2103d12ef921eb7903