Merge \\"Add MessagingStyle transitions\\" into nyc-dev am: a5e2aa99c0
am: c8649b381d

Change-Id: I161d5b15e494676192fe43b4147d0cb503ce031c