Merge "extract cleanup jobs from run method in ModuleDef" into oc-dev am: 49f4a0ef3a
am: 187420d0d8

Change-Id: I0170d34e5e966e53336e1a25836706142524eeeb