Merge "Improved Autofill logging." into oc-dev
am: 2d5c0d89e5

Change-Id: I222ecf081d1d841350191fcfe36aa457fdbeb305