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

Change-Id: Iecfe334d0effad74d32059a42f80b38f2bf868e7