g2 vzw

Change-Id: Ic09d7b009aaa4a90201eff926a5ea75056a1ebfb
quincy(att/tmo)

ps2: (nuke) may as well get tmo too

Change-Id: If8dfc81b5ace167e547a444a2aa6c50e249ee01e
add missing overlays for halo toggle

Change-Id: Ic1df6710d7b41e837843db0a5b48557ff6f32d36
Merge "add missing overlays for halo toggle" into jb43