Merge "Explicitly allow shell to update listener/assist" into oc-mr1-dev
am: 24a94491e4

Change-Id: Iaefcb277dffd79f0851d759df8afbf3bbc1d14b5