Merge "Import translations. DO NOT MERGE" into oc-dev am: 92b5eb6a98  -s ours
am: 4daf443e05  -s ours

Change-Id: I19763fe47c9262d79e5e1e76540ec6481e9b30d6