Future proof ZeroOverlay

The existing Overlay is not compatible with the new
overlays that will be pushed out to stable soon. This rectifies
that.

Change-Id: Id690c8bd83d50c6f4ea1de74092f191aaa6b717c
Merge "Future proof ZeroOverlay"