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

Change-Id: I0c90ff4438e60402aedf06be3e664c8e72fa445f