am 6aa0843e: am fb68b0ad: Merge "Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev

* commit '6aa0843ed95d3af828c8dc415053b91f3db25fac':
  Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties