Merge "Fix issue #30929080: Default Assist app is set to None..." into nyc-mr1-dev
am: d6ece3e175

Change-Id: Ic07c8b9212422afca01e28682608c577594d5931