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

Change-Id: Ica458f82fe18edb4f2b74b11aded21b66f1096d3