Merge branch 'PartialRevertMattesPDFSize_release' into release

Change-Id: If0e5340531f32d4b390b6cc921e0c657be25081e
Merge branch 'release'

Change-Id: I5b7ee802ad7bba131e1153c026202e7dcbc7ea5a