Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7011419f06  -s ours
am: 6c3370a924  -s ours

Change-Id: I2a6e4e74ea8545b009c08eb95354ec9107dfb412