Merge "impl update trust_indicator in scenario"