Merge "Log FIELD_AUTOFILL_SESSION_ID as string." into pi-dev
am: efa585d96a

Change-Id: Iab4f5cc70bd11241b83572c243c7a66c50fd04a7