squash to backup fix

Change-Id: I1c1943e7756df229a0a38284fb941305df7916b0
squash to backup fix 2

Change-Id: Ie758f8f7750e4bbbec0e768ae5a6f584b4f7860f