am d0e005de: am 0e7d497c: Merge "Fix issue #22328792: Fix scalability issues in AssistStructure" into mnc-dev

* commit 'd0e005de8c2ed3158b430f5867243a15c215957e':
  Fix issue #22328792: Fix scalability issues in AssistStructure