Merge "Remove references to "
am: a71ec6419d

* commit 'a71ec6419d9e80b354de721003c8b7929d224a49':
  Remove references to $(ACP)