CTS for improved restore logic

Change-Id: Ib4d933e3e6ad4bc586f64fbc33c363f8bebbd180
2 files changed