a-robinson Merge pull request #23302 from a-robinson/cherrypick_23265_1.1
cherrypick-1.1: storage: Avoid transferring leases to draining stores
Latest commit f6b7567 Mar 2, 2018