Import translations. DO NOT MERGE am: 31abbee452  -s ours
am: b2db5c0028  -s ours

Change-Id: I304c0388ef91b7c4e4cfadf0a8a24b9efd1566a8