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

Change-Id: Ib0637c6b915f1fd359f6e2ef9284942af05dbeab