ref: a858c5c227de6aef8af519386c326a866b397cd0
parent: 4e9dc6d45d6d1e4adbc5cdba5d7cd0f667b1b85d
parent: 82f6af600952f8924b3fd56e1f6296a74816c2c2
author: Adrian Grange <agrange@google.com>
date: Wed Jan 22 06:14:07 EST 2014
Merge "Tidy up comments & remove commented out code."