Merge "Creating infrastructure for aai simulator"