Merge changes from topic "drmAddListeners" am: becb0586a4
am: 5d75f88358

Change-Id: I851f8320ca58537f44c2a3913437ea94b6cad068