Merge "Make changes to testapps for API changes"
am: 10de7ddc65

Change-Id: I5d8dbe36b8361fae9e8627f45cb418f5927d7527