Import translations. DO NOT MERGE am: 972c78b4ee  -s ours
am: e87f2bbaa0  -s ours

Change-Id: Id32e92fba6ba6fbb791e0afd275cb59ae1dfe96e