Merge "Otadexopt: Attempt to mount product partition" into pi-dev