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

Change-Id: Ia09ba1e0a6e3ba9543a92ccf7f03f7a898f26fb1