[automerger skipped] Merge spl-2020-12-05 skipped: 535a647b51

Change-Id: Ib6a33c07c9de7c33c8d4aa80cd6a40c7bca0f95a