[automerger skipped] Fix minor issues in dmux default impl am: 7ab999d0a3 am: 105a8a6adb am: e6a156e3bb
am: c6ef9ee747 -s ours
am skip reason: change_id If74df110cd9eda2dadb87a8d659d83233ad75d88 with SHA1 9a1e5aa93a is in history

Change-Id: Iccb7ef5e156b4d4acb5783cfcb1906f01dfd9e4c