Merge "Disable test for now." am: 3aec725d03
am: 3220aad231

* commit '3220aad231a5cc5372e2cc5baa7cd4d3496e779e':
  Disable test for now.