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

Change-Id: I83142fed8969dcec8f81fac7380ea79b7044f0fa