Make the empty partition a primary

Change-Id: I28f1a019efd1af3a56273e4a09983ec27c92b6ce
Merge "Make the empty partition a primary" into production