am fae32a91: merge from open-source master

Merge commit 'fae32a91bcc0c0f397ea681a245d32e759718618'

* commit 'fae32a91bcc0c0f397ea681a245d32e759718618':
  Revert "acp: Ensure dst mtime always greater or equal to src mtime"
  acp: Ensure dst mtime always greater or equal to src mtime