Merge "Make changes to testapps for API changes" am: 10de7ddc65
am: 7f894ce5e3

Change-Id: Ia3f815ea87525ba77deecfea0a8e3a7f0204e8b1