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