Merge "Add support for reading modules.load.charger when booting into charger mode"