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

Change-Id: I93c5e34494eb4d3cb56ca3652406cc2a24d62fd4