Import translations. DO NOT MERGE am: b1da14d368  -s ours
am: db9763e918  -s ours

Change-Id: Ic2daa321b6c7d9f6943c8dd20c4473402b3574ce