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

Change-Id: I67d9509771f79e37f164b480a6a5955182c73ad3