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

Change-Id: Ia70062c385ef3d7e49d7cb5bc555824072358ed9