[automerger skipped] Merge SPL-2019-12-05 skipped: ec75b478a8

Change-Id: I366347a814da49dda60ed84684e83c0854caf9b5