Import translations. DO NOT MERGE am: c11e301ca4  -s ours am: d648bf6c97  -s ours
am: d958623eed  -s ours

Change-Id: Iad5badc883973c56a56fb5f08030367b6be05c98