[automerger skipped] Merge SPL-2019-12-05 skipped: 5750087d2a

Change-Id: Ia3b5edd9fa5e3efb4ef84478ff2f693d121202e3