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

* commit '5866c04a6b152aac6dd13e9ebba9a86831a84a29':
  Fix build.