Change testapps to reflect API fixes am: a7b8837b40  -s ours
am: 276a29e5c1

Change-Id: I0d0a4639157a91aaea56a05a516850ab8ec7bb82