update overlays and configs

Change-Id: Ife3e21862e2ad5df883c685ae73104e41e43481b