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

Change-Id: I741f90dd6b96da3d62f3a98a229a2d96755d7c8b