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

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