am 5c705c59: Merge "Fix build." into mnc-dev

* commit '5c705c595d6adbb4b6e8ad5dee29205246cd5cc4':
  Fix build.