[automerger skipped] Merge SPL-2019-12-05 skipped: 59395aefaa

Change-Id: I88c0fde3a6e296c10b990b0550fb958a645a6f54