Merge "Add a test method to test interface in struct" am: c0204ee13d
am: 932c93f52e

Change-Id: I241e34de84b0d44c652fd60fc7341a788e169e24