Merge "Revert "Revert "Adjust monkey to changed internal APIs"""