element.
Several files associated with a future CL contain extra whitespace.
I've made a separate CL here to avoid inflating the "changed lines"
count within this future CL.
Change-Id: Ie8199abd2a61b77d0fb349435983050e0e06afc7
Abandoned-Change-Id: I92f75ba0ef08e10210434f824fd99caee3703b5e