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

Change-Id: If579306318f2f38af5c11359e59b357ea0942b56