Merge changes Ie8f4efaa,Ic1af43cf into main

* changes:
  set aconfig_declarations containers to system
  set aconfig_declarations containers to system