Import translations. DO NOT MERGE am: 28f02b2e72  -s ours
am: 315c1338a9  -s ours

Change-Id: Ia83d10238d82c1ba9fdfe94ccc64ff95fc922c19