DO NOT MERGE - Temporary fix to disable augmented autofill requests coming from am: 483da538 am: 4314a0ca Change-Id: I2ede64f2853e854dc1bd7d6f0d8b16a96b6f1d12