Merge "Shave a stack frame off asserts." am: 199c27734f am: d10d64b244 am: 428ebfa528
am: 60bcc43a18

Change-Id: I6f0ef8ad3358c60c121aba1214ccc5efb9dda122