Merge "Temporarily increase saved tombstone size. DO NOT MERGE" into lmp-mr1-modular-dev