Merge "Modify sample streaming app to use state change reason" am: 8bb8f40d1e
am: 90d0e3163c

Change-Id: I6fa0cf12f3e85bc2304011a122a21de5495c976a