am 69bae122: am ee0ff061: am fcb9033a: am c85a63c5: am 1beeb0aa: Merge "Revert "Workaround for remove stuck (issue 11080792)"" into jb-ub-now-jolly-elf

* commit '69bae12252c670ca111708f414b559c5d5dddf8f':