[automerger skipped] Merge "DO NOT MERGE: Use a weak pointer to deliver...
[automerger skipped] Merge "DO NOT MERGE: Use a weak pointer to deliver updates to AVRCP devices." into pi-dev am: ab45924f -s ours
am: 7dd6ec00 -s ours
am skip reason: subject contains skip directive
Change-Id: I391c7f88a8d5aebe41ce789216c04669665193fa