Merge "[RESTRICT AUTOMERGE] Remove unnecessary test." into pie-cts-dev