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