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

Change-Id: Ie7867922a7d974787032d26fc2c78bb9e5d81497