Merge "Otadexopt: Attempt to mount product partition" am: dce2457fd9 am: 2541e4fef2
am: 5f3079b336

Change-Id: I6064de90f0deb772d152b6f01754247c642510a8