Import translations. DO NOT MERGE am: 9d652db6a4  -s ours
am: b024dd7501  -s ours

Change-Id: Id17a8898db1aaf4230d66d062884d0ac4b5d391f