Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 2bf548f090  -s ours
am: 5ef3328a09  -s ours

Change-Id: I124fad2fce539dec24abc70a2eb896cb333d3450