[automerger skipped] Merge SPL-2019-12-05 skipped: 31b69d02b1

Change-Id: I735777ae21b072b06b452245c2e023bcb3516d94