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

* commit 'a279b12905f31231a8f3c36c52abcd1224449c1a':
  Replace custom rules, remove ACP