Merge "Scan for methods in extra interface hierarchy" am: ce33604360
am: 3a1969b22c

Change-Id: I5828b40d1850bdfe09a1c13fe640184e5f34191a