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

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