Merge "Move allowGeneratedReplies to Action" into nyc-dev am: 9de0f87
am: 3c24df2

* commit '3c24df27d9dbad9762d68a338bcb68044fa8dc01':
  Move allowGeneratedReplies to Action

Change-Id: I97df3280e3cef7c1f327ca5b94651a12c8b2d425