Merge "Further first pass allocation changes."
authorPaul Wilkins <paulwilkins@google.com>
Sun, 25 May 2014 21:48:36 +0000 (14:48 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Sun, 25 May 2014 21:48:36 +0000 (14:48 -0700)

Trivial merge