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

Change-Id: I1424bd35c99c82a25932fd1491b67eb420d67d2b