Import translations. DO NOT MERGE am: 1e1f4535d8  -s ours am: 0975af3250  -s ours
am: be70cb2bc4  -s ours

Change-Id: I2a64b57af0ebdbfc603f9b151912b1e53bb8728f