Merge "Track the AVB property name change."