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

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