This also includes a couple of whitespace fixes to satisfy the pep8 gate. Change-Id: Ic0addea87c03ab9cecd09471450bdfdd338c59fc