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

Change-Id: I6981820934e6a8fe28dbe961b7c4697fea897f2c