Import translations. DO NOT MERGE am: 090db27d8a  -s ours
am: dcc38ae9c1  -s ours

Change-Id: I2e958af2e9ef424f75019b682e88c8a7bab9e0fc