[automerger skipped] Merge SPL-2019-12-05 skipped: 00a1fdbbf4

Change-Id: I93325c64d484a478dbe61a18c39864d6659c14ad