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

Change-Id: Id6b10e92c6c3740ae5e9cc57b3b58c5005e658f4