Switch Again till next Derp (Device specific)

Change-Id: I1ecc4f48e8a30241d2400f54db538ca9abab4b9f
Merge "Switch Again till next Derp (Device specific)" into pac-4.4