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

Change-Id: I09903f3d9268c5a6bb67fff36e558259a230246f