Merge "Change testapps to reflect API fixes" am: d8a38c8c47 am: 2fdd64a300
am: 3a96a69192

Change-Id: I298fee5fce2b9a30d3695f4b1c083f82096c17fe