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
am: a3cd1654 -s ours
Change-Id: I54fc2e5b7547b87cd8ff8894bcb77bafaeff1f22