am ef8913c0: Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1

* commit 'ef8913c035e679ea8b8891e26db1fa571e9b9d54':
  Remove dangerous and useless optimization Bug #5525888