Import translations. DO NOT MERGE am: e930d5a5f4  -s ours
am: 7ab0a985ae  -s ours

Change-Id: Ic929db922d61f1cc29c9765b2786d0af5edfdd9f