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

Change-Id: Ie2e5af05718705c935d915e7d1644f4b99128ed7