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 am: b7b239c6d6 am: cf2b75916e
am: 9c4e5e2e25

Change-Id: Ie6adf400f1bd3a14bd757cfb151a300b6b32f20c