[automerger skipped] Merge changes from topic "drmAddListeners" am: becb0586a4 am: 5d75f88358
am: f270b178e4 -s ours
am skip reason: change_id I81eb6ceda4527d9362e270fedbbb117d0d5b57e3 with SHA1 c76077c11f is in history

Change-Id: I7fdfa6495f289f56a65c17692d9bbeaaeb34db4d