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

Change-Id: Ib35ba06b925cd9612881570a494ba50ede73ebd6