Merge "interface-related commands porting"
am: 808c2fa747

Change-Id: Ibd1a04cbe8aa657148ac8536814a08aba1a6f71a