Merge "Fix lint package membership lookup" into studio-1.4-dev automerge: aa5a581
automerge: 873a197

* commit '873a19703e42d6946dfcff62bac6de779698ffa6':
  Fix lint package membership lookup