Merge "Fixing some issues with the assistant stack" into oc-dr1-dev
am: fbb85140f8

Change-Id: Iaf515fe72bd89ce4cf903ebb6d1c631353482c95