added backup support - CM (2/2)

Change-Id: I0c7fb0f8491b8564ebb204b8f4a90d82212cb62d