Merge "Fix dependency on truth intellij project" into studio-1.1-dev