Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes...
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev am: b2a48524 am: 990bd0a8 am: abc70842
am: c268ac67
Change-Id: I4e40e8dc5fe42ccbc475849f5769042068d7ad57