Merge "Add a reason arg to streamStateUpdated"
am: 6ba3829074

Change-Id: I0c05734f18d58d7693d8777a4d1bb7950a5f54af