Merge "Put an assistant mic in KitchenSink" into oc-dev