Import translations. DO NOT MERGE am: cf35085cfd  -s ours
am: ffd768ee8e  -s ours

Change-Id: Idd4a0b2eb0b073f079d7a63066e02ea1e2138e41