Merge "BufferingParams: add annotation @TestApi" into pi-dev