Prepping for BETA: Alpha -> Beta
- Hybrid Confs
- Cleanup of build process

Change-Id: I2f5bfdd4620fdacee02de4d5e1899cb5371be169