Not an exhaustive list of changes, just a starting point Change-Id: Ib3f3e2da64519d7350239053bc8f7950ee275d23