Import translations. DO NOT MERGE am: 37fa5cbc28  -s ours
am: 35b2ed41ce  -s ours

Change-Id: Ibc2fa8caa377cdf5433842929549359ce8e4b71b