Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: fb46471c3c  -s ours

Change-Id: I52ecd76a0acfa7875d43429c5136afc0bf2db425