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