[automerger skipped] Merge spl-2020-12-05 skipped: 1be8cd4b26

Change-Id: I21855e50d9d4952b5fdbd3628d662078b05d043a