Merge "Add firmware reload support for P2P"