Merge changes from topic "drmAddListeners"
am: becb0586a4

Change-Id: I1232f743200f7adc65761fc38f0ad0a16e0f59b5