Merge "Remove custom copy rules, stop using ACP"
am: 72dd79f

* commit '72dd79fa41fad71a14bb82eb830c927299d92d02':
  Remove custom copy rules, stop using ACP