Merge "Change testapps to reflect API fixes" am: d8a38c8c47 am: 2fdd64a300 am: 3a96a69192 am: cf7c5b55b8
am: dd724a1852

Change-Id: Id03649d771f48ebbcca2533d8988b0948b536721