am 664251a2: Merge "Fix build" into mnc-dev

* commit '664251a2fd16e63762be2ca93f2559dc2b134726':
  Fix build