Merge "boot: Relax getSnapshotMergeStatus test." am: f32d41bd11 am: f2a0c5be2b am: 5e77ed6015 am: 6c7ddecdae

Change-Id: I135d90913a59bad046d2cd768e645d349646122d