am 61df6ac: am 2f563a4: AI 148431: Marking as broken a couple of tests

Merge commit '61df6ac69e6614cb9986bf4ce3626dda914e0c6a'

* commit '61df6ac69e6614cb9986bf4ce3626dda914e0c6a':
  AI 148431: Marking as broken a couple of tests