am c1fa5983: am 52fb2230: Merge "Fix Hashtable CTS test"

* commit 'c1fa59836cb9699e22b90eba7fa443e41ac9530e':
  Fix Hashtable CTS test