Merge "Support /product partition" am: 8f324542a2
am: 10e1ec7de3

Change-Id: Ia850e866ae87f0fb72ab59a7abea12e58ebc0115