Merge "Adjust testapps for API changes" am: 44a09bb096 am: 61f33e4ce2
am: 8509236278

Change-Id: I0416a8143276fde74c0798b419b8173494a1eb62