Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 4b7b89b9a1  -s ours
am: 9be01e0258  -s ours

Change-Id: I63bad0555c9ab4959e2fb073597de93d7477f0e8