Import translations. DO NOT MERGE am: 3c654c199e  -s ours
am: fdaa46fb50  -s ours

Change-Id: Ie03014fa0180bbfc1636b7362dc040c72e41828a