snapshot.id doesn't have `tmp-snap` in it as id
is not passed as a option while creating snapshot
object. This should be change to
`snapshot.display_name` at same location
Also includes regression and NITs from other
patches
(I33da9c65ef56b3e4967170e3a0fb25f12e067876)
(Ia620043904f4f31a81bc8463fb36476a149f9808)
(Id0b4981be5bf4e79aedcdad2258fc64aad8eeb72)
Closes-Bug: #1875570
Change-Id: I66da0212a61d778fe9795d382b3af5b225a8aa54
(cherry picked from commit f68a64540f)