various autojoin fixes

Change-Id: I96acd02764a6fd7c8482ab82bd7e33280b90a577
1 file changed