Fix build, String is different in mnc/lmp-mr1 am: da0b723082
am: 7dcfaba47b

* commit '7dcfaba47ba9620a6229840298038fc94efcf8b3':
  Fix build, String is different in mnc/lmp-mr1