Import translations. DO NOT MERGE am: c7f9428204  -s ours
am: e88a573597  -s ours

Change-Id: I588a5f8358e84f530d6475cca15bb158c835d7f3