Merge "DO NOT MERGE update current config with dhcp settings" into honeycomb-mr1