Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 1dab2308cd  -s ours
am: a9a2720fb0  -s ours

Change-Id: Ifc1e89f99aecf395fdcba9d115c0830a7968e7ae