Please remove this before merging into the hotspot branch.