Merge "Fix one compiler error found by mmm" into mnc-ub-dev
am: 528aa049fc

* commit '528aa049fcd76e5d0f10fa750762c2b542ccfae2':
  Fix one compiler error found by mmm