Merge "Change registerStreamAliasingDispatcher from oneway to two-way" into udc-dev