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

Change-Id: I62e437ae87f27e48a8f61c43952d76d1ee1d3435