am 7042613c: Merge "Fix an incorrect assert that doesn\'t account for element array size."

* commit '7042613c653fd0de253f2f659901318902fa4584':
  Fix an incorrect assert that doesn't account for element array size.