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

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