Merge "fix elst calculations" am: c10a3e93cc am: ee4079a30e
am: 73eaa54c87

Change-Id: I27c37ebb1ccc25618c5955d2d4db70c314f3a2d2