[automerger skipped] Merge SPL-2019-12-05 skipped: 5dfd0b31eb

Change-Id: I9d0b874467f3a9c52bdc979d9386c59f4a66bc93