Merge "Fix checks for reading and writing FuseMessage."
am: d619026c07

Change-Id: Iaa0fd66e3f3fab3e9e9835aaefae36746c0450a3