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

Change-Id: I3a38798c4df861e3ea7289302bf0bdb0b504cbd8