am b12df35b: am 1af02e61: Merge "Fix Mac build." into mnc-dev

* commit 'b12df35b20eed0045d4b45dddd29a81e688da0da':
  Fix Mac build.