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

Change-Id: I697ddaf388fb9cb6eb105cb32bd1dd9c0ec42269