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

Change-Id: If82a0d7c0fa4543279e5ac596cdfc298b6b86392