Merge "Make the log message in setInteractive a local variable." into oc-dr1-dev am: 22ec7b0c46
am: deab4f0add

Change-Id: I6f1d64c5dbb2f221f8d0bedeada2c6e31727697c