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

Change-Id: Ic550bc35c8866a9822c51c9a5f16405cf683ec5a