[automerger skipped] DO NOT MERGE - Temporary fix to disable augmented autofill requests coming from am: 514271fd61 am: 4bc70a0050 -s ours
am skip reason: subject contains skip directive

Change-Id: I8dfc67edf625242cba5ad40cdb29c6f0b23a4cef