Add HA support

Change-Id: I8ac25b1da651ba069971a54385938e5358d25d07