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

Change-Id: Ic2ce4bd9632f3f27903308437f28efa07b20f81c