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
am: d114cccc41

Change-Id: Ie08bbddf0aebf337fa2976b1a8a29efef3ec8a71