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

Change-Id: I66db2390d4c9b4265eb22ed78e538366381fbda8