Merge "You get a memory tile, and you get a memory tile." into qt-dev am: bc276072ab am: 041e6b7fca
am: 65377a9f55

Change-Id: I0882401fd58900ff63f31c20c021c5dd48e6e4e3