Merge "Adjust testapps for API changes"
am: 44a09bb096

Change-Id: I851526f5e840773b3375fd379e2f4d79330ce03b