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

Change-Id: If3dfe057f3fbbc260a5b1e98f22c76a3e5fb4c05