Merge "Additional clean up in onUserRemovedLPw" into nyc-mr1-dev