Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 6ed9a78922  -s ours
am: e81904ece6  -s ours

Change-Id: Ic638e56f8f312068875245a2074c20c4b25206d5