Import translations. DO NOT MERGE am: b4f16b10af  -s ours am: 767ca11384  -s ours
am: 2fd6220a26  -s ours

Change-Id: Ia3a8f2434e6edb2795ac67ce363f6d4bcde75c00