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

Change-Id: Ib3a5f22228d805985afcfe63424b64a9508dba31