Merge "Fix Broken MessageQueueTests" into gingerbread