Import translations. DO NOT MERGE am: e6ca59ae0f  -s ours
am: f4113eb379  -s ours

Change-Id: Ib2035520e0aca189e5efcb9fdd6aa974f86ba83d