Merge "Mark 'candidates_style' as not translatable" into nyc-mr1-dev
am: 041db68b14

Change-Id: I2d7e73d3fdd3f4991be29493cccaa780054d1fa7