Merge "Replace custom rules, remove ACP" am: a279b12
am: 15348ea

* commit '15348ea4aaa9dc449ab8705e1d5ba108f475dc68':
  Replace custom rules, remove ACP