am 162d9433: (-s ours) am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev

* commit '162d9433502c05c544ddb10d38f9c4b129a82352':
  Make the booting flag update unconditional