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

Change-Id: Ifaf897e10442ba707ad391aaaa15526b57f9a754