Import translations. DO NOT MERGE am: c65b022f86  -s ours
am: 1dd6776dd4  -s ours

Change-Id: Iddced60d0d85bec97560d746e1c4d8b296df556a