[automerger skipped] Merge SPL-2019-12-05 skipped: 16eb88d0da

Change-Id: I6b2efa95fd32974fda808ec59373130100ec777a