[automerger skipped] Merge SPL-2019-12-05 skipped: df31c3ee05

Change-Id: I774990803b3ad96176a4d654020beb5876d66fdf