Import translations. DO NOT MERGE am: d879e88bf1  -s ours
am: db969c420d  -s ours

Change-Id: Ib535746cd2a864306ea2dcade56d06731c416b79