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

Change-Id: Ic2d731690121c5e047d1df2376ef5a8f83be14ea