Import translations. DO NOT MERGE am: 5fcef3228e  -s ours
am: c05d49a62d  -s ours

Change-Id: I190d34720c2f9b818c2f4ac38afb916825f09b72