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

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