Merge \\"Switch to new encoding scheme for large records.\\" am: 0380bb5f26
am: 702e0b6c3d

Change-Id: I55544638af87003c870868f0f1255817f7579cd6