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

Change-Id: I5bdfc474cabd8734d6de0845ff989d314b4fcfcd