am 04c9e3fe: am 58475493: (-s ours) am f5e6f649: am a6b8d65f: Merge "Add missing getFields() lookup from lint\'s resolved class" into studio-1.4-dev automerge: 2d1eb23 automerge: 3791dd8

* commit '04c9e3fedf9e5be9b50923b0f4ccece14aece29e':