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

Change-Id: I2cdec426d71abfd458257f00fd31f24105969398