Merge "Change testapps to reflect API fixes"
am: d8a38c8c47

Change-Id: I649f827b370407fbcf01af9a674aa9e933bffe7d