Merge "Make the log message in setInteractive a local variable." into oc-dr1-dev