Merge clearwater-felton into clearwater-sp1-lcm

Merge this only when @zli is ready.