Merge "Support /product partition"
am: 8fe7f9bfa2

Change-Id: I3ee5e565f9855b1b14883355b8a048cd9f67da00