am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""

* commit '8a9fc09c92cf0b1f08186c9339952e47eddee74b':
  Revert "Don't reset cachedSize to 0 in getSerializedSize"