d2: squash kernel upstream cm

Change-Id: Ifb9782de28e4d6a59ce63e43534ecff6e5d50eaa