Merge "Add unit test for delta-q (aq-mode=4)" into nextgenv2