Import translations. DO NOT MERGE am: 7ad7f68e9d  -s ours
am: 9f4479992a  -s ours

Change-Id: I63de59ed638503f57f9029447aef496eec093a27