Import translations. DO NOT MERGE am: ddd7680cce  -s ours am: d54a4c3273  -s ours
am: e6620626de  -s ours

Change-Id: Ib3226be6aa8ad9b131e4f348e815c16383e4293e