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

Change-Id: I80c0cc26c8a244a3c74d0fdd736e404ec9e9c0fa