Import translations. DO NOT MERGE am: 599bb2dbe7  -s ours
am: ad5c1b256a  -s ours

Change-Id: Ib1b32ebe070408a9c676581154bb9a8da429ee50