Merge "Track lint API change" into studio-1.4-dev automerge: 131c91c
automerge: 3f087d4

* commit '3f087d44fccae54a4ae9fa43c7a67ccc05cb344a':
  Track lint API change