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

Change-Id: Iae7e2135360590f7246aea640fadd95ff0cad4c4