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

Change-Id: I549a67291bbb4f73c255eab62b93d468a7f9433e