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

Change-Id: Ifeae2b2389039131f49b8ca3523c60c25813485c