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