Getting ready for Complete Restart!

Change-Id: I3b0abd4328fc44eb69acf2088cae791d53b898a8