[automerger skipped] Merge SPL-2019-12-05 skipped: 40af1a8e17

Change-Id: I0372aaea531086cfe9a4427c748fcfebd439ccc2