[automerger skipped] Merge SPL-2019-12-05 skipped: 900d448f60

Change-Id: I9495deb3f88ce6b83946db34e603764a8124d145