Cleanup AD preference

Change-Id: I824cdb2df07e4f25434ffa69bc3e37007559bf98