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

Change-Id: Ie0a31a3763449a66910b721cd7d1d7535496d7fc