Merge "Change testapps to account for API change" into oc-mr1-dev
am: d7a47b9e1f

Change-Id: Ic1b78784cf9e778a2c3eba1c96df37872fc347be