am 7b4c9725: Merge "Fix build breakage by updating current.txt" into klp-modular-dev

* commit '7b4c972577179b2dfcf8a59c31b3730d097c5d46':
  Fix build breakage by updating current.txt