Merge "Switch to librarized version of TestingAccessWrapper"