Merge "Hide various mbstate implementation details." am: dcdd0e3760
am: 452c185a0b

Change-Id: Ic0e08363041365345232755d678d9caf2a2c4541