Made changes to update java doc comments.  Move AutoContactFillAdapter to the correct location.