Log stable/icehouse for sahara and remove obsolete

Change-Id: Ic152f8a35443f9a4426ec62b2f26a90231c39331
Merge "Log stable/icehouse for sahara and remove obsolete"