Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested"...
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into nyc-dev am: b01ee142 am: 6c86c5fb am: 7a8e9c13
am: 3a93258b
Change-Id: Ic8af3f38856ec2be7dffa347c04432cb517c265a