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

Change-Id: Ic109750315a5efbf25ef1cbd90a0c097094a3037