Sync Hotplug, Govs and Touch with Francokernel (reverted from commit bcfe9ec41c87623cbffca895d4d9d9e2e5e00eed)

Change-Id: If74606e315c515c187750b1c194a9f2d12a7b8b5