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

Change-Id: I8fe1b6f94b3a1d673d2604a0d660e1cabba825ef