Merge "Fix AVB key path again."