Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 59a800d0ec  -s ours
am: 967ad51df4  -s ours

Change-Id: I8f1c32e7de1f816c42ae1d34eda472f6d3074254