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

Change-Id: I4f67fa72d783c5fcdfa0c36291d06ba1edc8955c