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

Change-Id: I6a46c18871f77a0f97c2498dc1595bd29e1e6575