Merge "Fix build on mnc-ub-dev" into mnc-ub-dev
am: fd7b4e5a69

* commit 'fd7b4e5a69ae0efcd6c8f8f450f4ea468df9a4f9':
  Fix build on mnc-ub-dev