Merge "Fix IsUsable to check for each controller separately"
am: 7e473e262d

Change-Id: I85c255fdd29e805ffcac8824a4243026db872c69