Merge "Read from aflags in dumpstate" into main