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

Change-Id: Ida4376025f16ad2a11f4dde1417b9f6d6b6134e0