Merge "Update REQUEST_PEERS message with calling package" am: 836e7405 am: e8431a09 am: dbacbe3f am: 6d6c885f -s ours Change-Id: I4cf30afeb45de08fd4132544861138ce45d3393f