Also made file documentation more consistent. Change-Id: I30e124514396f110a572467b94ca06cefd5f7b46
Patch by Edward Z. Yang.