am ec2247fb: am 829f37f3: Merge "Workaround for remove stuck (issue 11080792)" into jb-ub-now-jetsonic

* commit 'ec2247fb4a099d8e423a6ca133637fddbf58c017':
  Workaround for remove stuck (issue 11080792)