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

Change-Id: Icc721ee3fd658ab503f60a45f2e8f7fd34e7a1d4