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

* commit 'b3a020a6de45bbcb1329d8f820e569cfd0de9325':
  Fix build.