Merge "fix elst calculations"
am: c10a3e93cc

Change-Id: Iaaa989706fbd52bff1440048cac866ae28060e7b