Merge "Otadexopt: Attempt to mount product partition"
am: dce2457fd9

Change-Id: Ia7b581c50f10c23c6d8761b7d3965f061f890651