am 2d51e75e: am 0b9e2abf: (-s ours) am 40f6fb41: am b622b867: Merge "Use raw types with JavaVisitor#applicableSuperClasses" into studio-1.4-dev automerge: b02d06f automerge: 1c584f9

* commit '2d51e75e5e35cff1b0b95d7093f7c85f0c7b1c23':