Merge changes I5581cd9c,Id6357fa0

* changes:
  SF: Add utility class for dumpsys formatting
  FTL: Add std::variant matcher