am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit 'ea68d73c08b3b9319faef8ef9cd283e773a6ef20':
  Don't reset cachedSize to 0 in getSerializedSize