Merge "Merge "Move allowGeneratedReplies to Action" into nyc-dev am: 9de0f87 am: 3c24df2" into nyc-mr1-dev-plus-aosp
am: 55ab684

* commit '55ab68454508bc53fe37c86e578cd3e4765eb7eb':

Change-Id: I1e3e3ed00669432453db92a6efd631f046c23846