Merge "Some cleanup for tests 960-965 build scripts."
am: 02c330f6af

* commit '02c330f6afdb2a528fc5d6c54a5fd683ddaa219f':
  Some cleanup for tests 960-965 build scripts.