Merge "Support product partition for non-treblized devices" am: 79bd67bb2f
am: 7a6df0832a

Change-Id: I6000af149381854d1095f42a99f9a3375a9036d6