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

Change-Id: I6a77525d3543f506e26badbbd5e90d34512776c4