Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 4628ca1e0f  -s ours
am: d9e794aca6  -s ours

Change-Id: I53eb18fddfe3aec9145c4c77917b5cea57647df2