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

Change-Id: I926289478fda669a0268e0c00a963191dab578b4