Merge "Change testapps to reflect API fixes" am: d8a38c8c47 am: 2fdd64a300 am: 3a96a69192
am: cf7c5b55b8

Change-Id: Ib097a81165674b971e2e5a7b62f4d47daa06af6d