Merge "Revert "Add static analysis data."" into pi-dev