[automerger skipped] Merge SPL-2019-12-05 skipped: 73e1510f5f

Change-Id: I039ec746efc8e1bb37b46535e11e5d71e16f5288