Merge "Disable test." am: 553ed05100
am: 4d51e99594

* commit '4d51e99594c8fff9d2a063b64c55f59b3fb68294':
  Disable test.