Merge \\"Add test coverage for a bug in the lingering code.\\" into nyc-mr1-dev am: b4db945883
am: 759fe4598e

Change-Id: I19439c95167bf215edc67068fb5a6859ab845814