add backup for Gateway

Change-Id: I2b0796101030a3c7aa9efff2be53df2ede3525ab
Merge "add backup for Gateway"