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

Change-Id: I8c71f30c91a5e26d52479e58beca36bd8eb641aa