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

Change-Id: Ica35f6b3716f76d6e29fbec3e62bc7117ad524ec