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

Change-Id: Ia5df0103767d537f74f254cc12bd175f65787537