am 17bd9a22: Merge "More performance work:" into ics-mr1

* commit '17bd9a22ec993fc9eba060950bc5cecd1e06ffb1':
  More performance work: