Merge "Import translations. DO NOT MERGE" into oc-dev am: 8d9d1ae932  -s ours
am: 9d55911ac5  -s ours

Change-Id: I3ebb083c11d21211a6ca33c2f77578b37dceba0d