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

* commit '76a560cab14a08beac287f2f02139f7c6dc962d2':
  Move allowGeneratedReplies to Action

Change-Id: I10055fa54d58f86bb186ff249de587e08d6d9d7f