[automerger skipped] Merge "Otadexopt: Attempt to mount product partition" into pi-dev
am: f9fd1660e1  -s ours

Change-Id: I8c08ee5e0b7a5f9ba8f0aac10f03cd61ebb31eb1