Import translations. DO NOT MERGE am: b18162c6f7  -s ours am: 73cc878a0e  -s ours
am: 7173e0f30e  -s ours

Change-Id: Ide3ef40ef6a07e6dd01c7069928bf165eac3a28a