Revert "Fix build, String is different in mnc/lmp-mr1"
am: 8ea3f16310

* commit '8ea3f1631043cc9381b5f07220b199feeec6a02f':
  Revert "Fix build, String is different in mnc/lmp-mr1"