Import translations. DO NOT MERGE am: fb2c23567d  -s ours
am: faa256055d  -s ours

Change-Id: I3a330b7e9f9354c35db935060f50a54514704a00