Import translations. DO NOT MERGE am: 970e4d9d90  -s ours
am: a7729a959f  -s ours

Change-Id: Ie43d83d2429c57507560da8eba5258df198dedb5