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

Change-Id: I6e58800fde8a6a44d342e15b9c79d02a9e5f7156