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

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