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

Change-Id: Ied79711e6c67ba673486707cf6fbf183aec6934f