Merge "Make changes to testapps to split a callback"
am: 24221209c7

Change-Id: I2c6c2d66e0eb153eb9ad231dc10d55daf0162193