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

Change-Id: I30e84a6b49953eaa2010459db3290aefc1c0a2d2