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

* commit '1d656e8aa21bbc463d717fde4709f2f3f4f004a9':
  Fix one compiler error found by mmm