Merge "Add adaptive midpoint for AQ1."