am 32551ae5: Merge "Fix infinite boot-loop bug in SM." into klp-dev

* commit '32551ae5197744425d3057dc5d449e7943d35ba2':
  Fix infinite boot-loop bug in SM.