Merge "Import translations. DO NOT MERGE" into oc-dev am: a980312abf  -s ours
am: 9f05e68ea5  -s ours

Change-Id: Iec6173e113757c3edd2f12a7e6f36b1baae6ba89