am ed3b4253: am 5cdc7f04: am 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev

* commit 'ed3b42539a4d883533177d008c7ffb2a58e50af6':
  Fix issue #22531747: Assist info should declare if user has disabled...