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

Change-Id: I1345c2d2d29a23d2d110bf5e4388f3123bb0b4f2