Merge "Merge "Modify sample streaming app to use state change reason" am: 8bb8f40d1e" into stage-aosp-master
am: 5f49fb238d

Change-Id: I802e0bdfb2f336919bf54b62e54fa5051eec2108