Merge "Explicitly allow shell to update listener/assist" into oc-mr1-dev