Merge "Add aconfig flagging setup" into main