sync with franco mako_hotplug

Change-Id: Ic618add1ab6a31a6d0572af1ed42c178f1392a4a