Merge "Shave a stack frame off asserts." am: 199c27734f
am: d10d64b244

Change-Id: I7b4d4f3497bdf95b651bfa8037a594c0faee50c4