Patch Set 1: I would prefer that you didn't submit this

Please resubmit the changeset with the proper Change-Id: Id72b763beac5db6050b05052ca99f39beba6dced in the commit msg and the two tests without all the whitespace noise...