Merge "Fix lshal for BufferHub Service"