[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 skip reason: SHA1 ab45924f skipped by user apanicke
Change-Id: Icea737fc2c51d0df1fb3bfc0bf9652cbcf3b6bbe