Merge "Can now indicate the desired number of notifications (sub-buffers)" into nyc-dev
am: d0389b874d

* commit 'd0389b874d592b960bdc456c2514a36b082c2c94':
  Can now indicate the desired number of notifications (sub-buffers)

Change-Id: I02b032f0124f88ffe13e6cd841f4d567d3ed597b