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

Change-Id: I802a0e34418bcabb9b3eb0e0da84e1043a5cc247