Merge "Move allowGeneratedReplies to Action" into nyc-dev am: 9de0f87
am: 2a1a315

* commit '2a1a315713d1bd210a3ae1f6235705aef5c90485':
  Move allowGeneratedReplies to Action

Change-Id: I4c7ed73930524c5a6e4426bbe71269bd67b23459