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

Change-Id: I2d2a94a02bc009e293c735f3f6a1e052a274ebe7