ref: debd0485311e455e9aa4394fb0586769704c06b3
parent: 620ce561548eb64178150be94e9c01c0a67b8d4d
parent: 1edbaeb09da311ad4ef489b5aa104bf8c01a9942
author: Paul Wilkins <paulwilkins@google.com>
date: Sun May 25 10:48:36 EDT 2014
Merge "Further first pass allocation changes."