[automerger skipped] Merge spl-2020-12-05 skipped: 2111eff73b

Change-Id: Ic44392e7c8ae1a67f7f7eac4b25ae526012dd8a9