Bring this in locally as overlay has issues

Change-Id: I677fae733bd80137a0e2e9206247f874470f36b9