[automerger skipped] Merge spl-2020-12-05 skipped: 61c863f764

Change-Id: I0ab4511249128fa62a2fd6619f250b3b1bda20b1