am 198a05b8: am d68cef75: Merge "Re-enable test."

* commit '198a05b83e9943aafc94bc2b1f03e0501b687248':
  Re-enable test.