d2 bringup, latest cm and proper tree changes

Let's get this party started.

Change-Id: Iba452194035630e780e6868aa5a6e65f0ff009d9