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

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