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

Change-Id: Iad761272b9bc676b9081956ccd0b841d71ac52a2