am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev

* commit '9353e1a2b2e8f02377c3f73565964ffb0927c776':
  Make the booting flag update unconditional