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

Change-Id: I6898bd283787221274fc06e666b1146cb65eaeb8