Merge "Make changes to testapps for API changes"