Merge "Support starting fuse from a block map" am: 090b62832f am: b96f2bf618
am: a51a41101a

Change-Id: I0e71e89b2cf9d81fe30db5666e5dfec4282fb221