Merge "Merge "Modify sample streaming app to use state change reason" am: 8bb8f40d1e am: 90d0e3163c" into oc-dev-plus-aosp
am: 04e5b36916

Change-Id: Ia721aaee2f95b29093b092f9c2d01759d1d79971