Merge "Use a separate code path for rich content in augmented autofill"