[AWARE] Remove support for vendor-specific attributes am: ccb1562771 am: 218305083f
am: ef3d29aa0a

Change-Id: I9bf98e0bf9f8ec0980ff42f2c6da0f54ab7aac3d