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

Change-Id: I675be5933d2c8ff3f1e0f77ffdba9a09ed733b94