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

Change-Id: I0c47169714b65f0d5fdc288abc29b2cc4906a6a2