Merge "Support /product partition"
am: 8f324542a2

Change-Id: I0fa35c223fbdc64158b8c8460ace2b631f342183