[automerger skipped] Merge "boot: Relax getSnapshotMergeStatus test." into rvc-dev am: e67a810c am: fdb2c17c -s ours
am skip reason: Change-Id Ibcb9f18f535cdcb5aae7e2c9c01e03681dbfff13 with SHA-1 f0fbfdd1 is in history
Change-Id: I37e71c2835ca380024205f042f86a2ab599b92b3