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

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