Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread