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

Change-Id: I98987578264825dd13d5519c9e40b2865d45715c