Merge "Aggresive performance optimizations." into qt-dev am: 433b7fc88b
am: dda03c678d

Change-Id: Ibce662c5c2e543476e518c4633af158db4913873