Make changes to testapps for API changes
am: 75b212e2e1  -s ours

Change-Id: Ieb31310ade2981e52ab19f8fac8cc137fcc3ff63