cleanup from asoc update

Change-Id: Ifb1d3e6c58ae2f604014a9352783412097a4beb4
fix2

Change-Id: I8e40cc6ecb090d99524184ab333d90792b9dc627
fix3

Change-Id: I5c1097b678e5a34b8ddb20c7b051f40e469c0cd0