Also fix whitespace issues introduced by last commit. Change-Id: I579abcd5f8bc743ee7fa0206307af9347e7352dc