[automerger skipped] Merge SPL-2019-12-05 skipped: 065cb21285

Change-Id: I2511fbe82337b8fdc801e8fd689d797446280e86