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

Change-Id: I6ca69f5a76434318728dbfaf51fb094f82746c8c