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

Change-Id: I45a76be2cec8829147d9ac4569da2087bf6722bd