Merge "Reset a session callback variable when tune is failed" into lmp-dev