[automerger skipped] Merge spl-2020-12-05 skipped: 026b286706

Change-Id: Id0769f2b6fe1a0ac1b9b2808bcabe762025615c5