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

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