Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 419407eaea  -s ours
am: 1ef2ec2264  -s ours

Change-Id: Ib4a2d4cc1eb42015dfdf56fba3417918de2af670