Merge \"Rewrite lingering.\" into nyc-mr1-dev
am: b0a574fbfc

Change-Id: I62d69f20101318b42d4d333b104dcf4f64dc1725