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

Change-Id: I9f2527098d402a44e5b8027ad1f205d4802d4566