Merge "Fix a regression in assist when context is disabled" into nyc-dev am: c3c45fa
am: 074139b
* commit '074139b878315913ba2ae78aa0d212cade94e02c':
Change-Id: Ibd1f925feffc7c25561eea7eb13f45482d7d2717
This commit is contained in:
am: 074139b
* commit '074139b878315913ba2ae78aa0d212cade94e02c':
Change-Id: Ibd1f925feffc7c25561eea7eb13f45482d7d2717