Import translations. DO NOT MERGE am: 251cbcbcc5  -s ours am: a09c96c1a5  -s ours
am: 07044295c8  -s ours

Change-Id: I94498408ff405b7f0093b0d1bf7beae718a4a2d5