Infiltrate•Destroy•Rebuild

Full reconcile with CM,...

Change-Id: I4f2213f0da78619dafa0ee4e15c0eb65a80d922e