Merge "Fix preload partition failure behavior" am: 6259714f90

Change-Id: I53eaec63fb7b7c3932e7d06ab3e9ffec6836bb69