Merge "Make peeking_take_while available to product and vendor am: 98e9e5e664 am: 8d254bf72a am: 301d254313 am: dfad9fefd1 am: d1a667e3a7"