Merge "Make autofilled highlight an attribute" into oc-dev
am: c7bd554d06

Change-Id: I8a35929069510a1483a734febb695a6f06af88a2