Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 6d76d24b4e  -s ours
am: 5e36c3d381  -s ours

Change-Id: Ie9cd38f76ee02b77cb59a0b1b3ac331724eb1692