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

Change-Id: I414a81701aaea44c4faf5cef89015bba9f08a32b