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

Change-Id: I8532e12351470e1aa5fc8ea3d0578f9112610ba9