Merge "Import translations. DO NOT MERGE" into oc-dev am: 7df8f5129a  -s ours
am: 1679a515a8  -s ours

Change-Id: I133db1a7c735c9d8d1226adfb9dffe4131a80127