Import translations. DO NOT MERGE am: 1cd0497bc2  -s ours
am: ed0386eb02  -s ours

Change-Id: I80c24262097bc779e41f079ca502a343e486759d