Import translations. DO NOT MERGE am: aaae7c4987  -s ours
am: 37ebb54c54  -s ours

Change-Id: I4418c4cece2c5a88362949bfdfa8215146a406d5