Fix minor issues in dmux default impl am: 7ab999d0a3
am: 105a8a6adb

Change-Id: I428e6117ab408b83c195af4a02cd690dec6331c7