Merge "Fix an assert in lse." am: 2f99a1c5b7 am: 0cf13112c7
am: 12092980fe

* commit '12092980fe48c8510a724b43e37fda40ad834eca':