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

Change-Id: I662e6548b28a40d3fd332ba91834cf7fd254b561