am cb906677: am 24c1d664: Merge "Remove an unnecessary condition from previous change." into lmp-sprout-dev

* commit 'cb906677fc65fd1b43f6dc3b8e029711ec8e86dc':
  Remove an unnecessary condition from previous change.