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

Change-Id: I292beb9a2e88c2ca680412002e82ec4426ec9cf6