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

Change-Id: Ia6ebdd2133a93d4974aacf463677516513aaa6bb