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

Change-Id: I48a2bf27a2eee8838d3aa09cc3e3f30b77feca11