Import translations. DO NOT MERGE am: 50e19c566e  -s ours
am: e708378dc9  -s ours

Change-Id: Iddd08f8c762a19e7785f0fc067154f246553e2ff