Reapplied so the P0 fixes it carries are restored. The defects the readiness review found in it are fixed in the commits that follow; this commit alone is NOT shippable.