added backup support - CM (2/2)

Change-Id: I8c3b73aa3d6f00dda01ec4fd98696e6f39068af3
Merge "added backup support - CM (2/2)" into jb-mr2