Re-enable and Update DeviceHandler for LP

Change-Id: Ic0d24263d18fd43e2f09af19c656e86c4fac72f3
Fixes for Bliss

Change-Id: I115feb5e98863c18ea283b03da3c0b43ddedb360