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

Change-Id: Ic0ba56c44e1d55eee11565e9427e26b25975f469