Merge "Merge "Update startStreaming to return status code" am: 6476ceeaee am: a89cacebfb am: 331058a871" into oc-dev-plus-aosp