Import translations. DO NOT MERGE am: 10caff8a09  -s ours
am: da1fed11fe  -s ours

Change-Id: I59387d69dac224f80e7ecd28d958b3b5f198fda4