Merge "Add test of undefined return address." am: 0ac9b9a894
am: 0a0ea79724

Change-Id: I79c8aa51dc0253ad47f361c60d1338b37461baf4