Merge "Support mounting the odm image"
am: 8337ffeae2

Change-Id: I21ab4e9d86eed7b83e215c253989c619cd3b95b0