Merge "Merge "Aggresive performance optimizations." into qt-dev am: 433b7fc88b am: b270eabe36" into qt-r1-dev-plus-aosp
am: afa4d3e44c

Change-Id: Iccf039d0f29cfd7fc75e086a36bb2a3fc1b06af9