Merge "Adjust testapps for API changes" into oc-mr1-dev
am: 8d01149329

Change-Id: Iaae1d2e3978a7bdafe2e0dbdefeca8ff015f9b36