See CL https://gerrit.chromium.org/gerrit/#change,11951 for the original CL.
BUG=chromium-os:23407
TEST=Tested on chroot synced on 23/11/11
Change-Id: I039d6b6ee06617dfa9263eab4fe83e128f0773b4
Reviewed-on: https://gerrit.chromium.org/gerrit/12106
Reviewed-by: Peter Mayo <petermayo@chromium.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Tested-by: Sean Paul <seanpaul@chromium.org>
Commit-Ready: Sean Paul <seanpaul@chromium.org>