Merge "Disable test for now." am: 97f4bc04b6
am: 7f8b7873c9

* commit '7f8b7873c93947bcc7181afb700839f0c2b77ca1':
  Disable test for now.