[automerger skipped] Merge "boot: Relax getSnapshotMergeStatus test." into rvc-dev am: e67a810c -s ours am: 640611bf -s ours
am skip reason: Change-Id Ibcb9f18f535cdcb5aae7e2c9c01e03681dbfff13 with SHA-1 3dd52813 is in history
Change-Id: Idbccd759293d200960c1f81e8355a178192fcca0