Merge "Small clean up of fuse code."
am: 54c211db2e

Change-Id: I09fbb1879d506789956c30d4890e4f6908003fa0