Merge "dx: Revise interface method handling" am: cb7a2eef06
am: 742050e366

Change-Id: I1fcb251e47db3a19669ca83eb1efea07a61b1120