Merge changes I6e6f1600,Id45cee90

* changes:
  Add SOURCE_APP to OnReceiveContentCallback.Payload
  Removed duplicate javadocs from OnReceiveContentCallback.Payload fields