Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp am: af3c9615f1" into oc-dr1-dev-plus-aosp
am: 5ca73a0f98

Change-Id: I6799f02b8d5949027c9215c4542e1f9620c74ba9