Merge "Improved Autofill logging." into oc-dev