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

Change-Id: Ic2c83a7b5485a75faff7bbf8b1364e3eda0586ed