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

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