Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 33192787ce  -s ours
am: caef97c5c8  -s ours

Change-Id: I6d7564148031d30113e395f6f5ee05d7e2afa460