am c93c30a4: am e54acd41: Merge "Fix build break from unnecessary assert."

* commit 'c93c30a47235d3796760bd16ee7829ed64e1e92a':
  Fix build break from unnecessary assert.