am 83d4b7dd: (-s ours) am 407771dd: Merge "Track lint API change" into studio-1.4-dev automerge: 131c91c automerge: 3f087d4

* commit '83d4b7ddf1a68c56de62036c475c7a1b08adfab8':