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

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