Import translations. DO NOT MERGE
am: bfb4048082  -s ours

Change-Id: I2102d8cb90aadb33952e2e08a6c8a0a7a818629a