Merge "Defer the instrument of AOD transition per doze amount"