Merge "Test for echoed interfaces." am: f5f75be7b6
am: a175fa4b4a

Change-Id: I6039b13c23d3b24d2f03e1e9a8208e9b4216cfb2