Revert "am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize""

This reverts commit f213b0c6a86503ad752139f04f343578df45db07, reversing
changes made to 1a4b1d52e44104f2e10d0cdc585dde88602843d2.
5 files changed