Merge "Fix a bug in HBD buffer size computation" into nextgenv2