[automerger skipped] Merge SPL-2018-12-05 skipped: 5b1117a2ad

Change-Id: I67d631ecc76adc132c0cc9f6f4e536c254f6001c