Merge "Add POMBA AAI context builder to OOM"