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

Change-Id: Icd35e4f7c9a7658f6d330bce33fea3dda3d67467