Merge "MessageBuffer: constify more fields"
am: 0c080f6864

Change-Id: Ia0970bb3728432573ad99fd76fdc55349c09c1ef