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

Change-Id: I3393f85819b8ed0fec35cfa0cbea0899141d73dc