Merge "Clean up Mac OS hacks in acp slightly." am: 0e80edd259
am: b938cbc7a7

* commit 'b938cbc7a7c0d98892e6268c45823861c05217fd':
  Clean up Mac OS hacks in acp slightly.