Import translations. DO NOT MERGE
am: 20fa1a92cc  -s ours

Change-Id: I2849c371f53a02857ec9d14a7565def9130305ea