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

Change-Id: Ic187ef90e16cfbf28ac0945dce399eeb3a565993