Re-add Hot Swap

Change-Id: Ic22fb729c589bb11f7a60ab9d0ec136a383427c3