Merge changes I121fe66c,I94f57f8a

* changes:
  Remove some cases for turning off arf.
  Modified Aq1 and Aq2