merge with CM

Change-Id: If0ed53a2296598e92bb8baf84d00c58067369f5f
added backup support - CM (1/2)

Change-Id: If1cbe8fa04a7cff7d455087216eca5378d5f6cd9