Import translations. DO NOT MERGE am: 3a1bec7197  -s ours am: d08c19e2f5  -s ours
am: 95c316986c  -s ours

Change-Id: I2f62858a51147fdfedd35b9b72c590baa06a4ee0