Revert "reflects reviews" Revert submission 11560 Reason for revert: Revert this and all related CLs to review the changes again. I will create a new CL by cherry-picking the CL that contains the up-to-date version. Reverted Changes: Id487b5bd4:1. Modify template files for vector tests with flo... I13979c48c:Merge branch 'master' of https://spacebeaker.googl... I7b24a230b:reflects reviews Change-Id: I76c2cae9629c14f97fb7f3e1517be77c7811765b