Merge "Disable suspend optimizations during DHCP" into jb-mr1-dev