am 15ec725c: am b3a020a6: Merge "Fix build." into mnc-dev

* commit '15ec725ce2a4811f8e5948d56609793dc3dfcf17':
  Fix build.