Merge "Support mounting the odm image" am: 8337ffeae2 am: 08d6d9604a
am: f30396c14e

Change-Id: I56f52d6d3578dda685136b8d92b43b6400308d1c