Merge "Add test coverage for cleanup bug to be fixed." am: 89e6bf0532
am: 0cca15ff88

Change-Id: Ib5d1a6d6616b99a9e4f7cf0286ebc0a11d62bff8