Merge "Fix GKI buffer leak with discovery information service reading"