Merge "Revert "Change testapps to reflect API fixes""
am: 30ff5a4dd1

Change-Id: If2aed4cdb8807ad621a61b9dfe5b0c03d22083ab