Merge "Change testapps to reflect API fixes" am: f710256951 am: 6f749e09c0 am: 9c1d1edaf3 am: e779126596
am: 5ab3fff7ee

Change-Id: I9424d08a8d4846d8b73def28a755f40d31c7c5ae