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 mnc-dev am: a8b95131 am: 7308e717 am: 61fae59d
am: c7951f38 -s ours
Change-Id: Ie6a054ff92fb0fe993d900b0c4a3873bb62e097e