Merge "Another guts redesign" into qt-dev am: 69ca6f531e
am: 8065b7f518

Change-Id: I2fc5834d07f9f670b7e23fb6a7093c9b291d4233