Adjust partition priorities

Change-Id: Ic04aa4e448220d012240331684295dfe9c4e8a86
Merge "Adjust partition priorities" into production