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

Change-Id: Ibb2ed0a33e9e1c46a780c606b0aed991fae90f5f