Merge "TBR: Move simulator to experimental, without preserving git history MultiPart: 1/2"