Merge "Check number of output buffers and sizes" into lmp-dev am: 493410548a am: 41d5957422 am: cecb593ca5 am: 6bf3e38d8c am: 1363086b84 am: 245b52a221
am: bee8b9e1c4

Change-Id: I87dc1731af0a0133075e4c9472f0ec02ca9dbf58