Import translations. DO NOT MERGE am: 50e19c566e  -s ours am: e708378dc9  -s ours
am: e7f7be9e14  -s ours

Change-Id: I7e88ec07c8fd6b0b595f675fd4f0f2e77cbcca77