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

Change-Id: I8c37374a324913042b669f3f088d391eaf6a59d5