Import translations. DO NOT MERGE
am: 1f1e95f0aa  -s ours

Change-Id: Ibcb76839deb919269d68cfeb5e1190382bcd12bf