[automerger skipped] Merge spl-2020-12-05 skipped: cebb5f6d0b

Change-Id: I6da0600e4871dff277e4211770cd136ddd4543cc