Fix overlays

Change-Id: I88079e4735e951cd18b2321a1cf5020beb70dabd