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

Change-Id: I2250d934cb9ea1b75aebfeb08436fadb7919364b