Import translations. DO NOT MERGE
am: b90904d041  -s ours

Change-Id: Iabf264ec4b8665fa10022c1b30383396e2c99191