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

Change-Id: I52da6971a529b18d171715bf28564408fbd59378