Merge changes I6987329c,I830048a5

* changes:
  SF: Save proto traces to a specific path
  TransactionTracing: Introduce FlingerDataMapper