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

Change-Id: I71aefe5e491c31e78d90f50f4768986fb8fd0c35