[automerger skipped] Merge spl-2020-12-05 skipped: 317a383bae

Change-Id: I1588ca3a46165a6b2914e5e637f3e8ea0d1b2558