am 9d2947f8: am feecf9d7: Merge "Support for changing traces from development...
am 9d2947f8: am feecf9d7: Merge "Support for changing traces from development settings." into jb-dev
* commit '9d2947f8':
Support for changing traces from development settings.