Merge "Update REQUEST_PEERS message with calling package" am: 836e74052e am: e8431a09ca am: dbacbe3fbe
am: 6d6c885f9a  -s ours

Change-Id: I4cf30afeb45de08fd4132544861138ce45d3393f