Merge "Update REQUEST_PEERS message with calling package" am: 836e74052e
am: e8431a09ca

Change-Id: If5f4f60919f2f4083f109e1609ecd1834030f1c8