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