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

Change-Id: Ia4a084be38e6f4dce14da012afb6760a3cbd32d0