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

Change-Id: Iefa99c2578934ba959d075e5b620d9cc81df668c