[automerger skipped] Merge spl-2020-12-05 skipped: 5de75de5c6

Change-Id: I97e5fc23a5c83c950d819043a6db13205720ceed