ref: 79774d108ff525bc1aeeb61b2d2e597b4c798a5b
parent: b1781b48dbdc77aeca06a8edcb67ec8b268c6608
author: Paul Wilkins <paulwilkins@google.com>
date: Wed Dec 7 08:32:45 EST 2011
Minor fixes: fixed issues caused by conflicts between two experiments. Change-Id: I56a9bd69493e4850c121ea057a6233c55777c2a5