Import translations. DO NOT MERGE am: 2c1d066618  -s ours am: be2efcef20  -s ours
am: af00336df8  -s ours

Change-Id: I2fe12cf18e7fb13847efb7c74c41ee55086fb9e1