Merge "Remove auto connection on ACL connection." into honeycomb