Merge "AVRCP version interop pereference (2/3)"