[automerger skipped] Merge SPL-2019-12-05 skipped: 27e192c802

Change-Id: I235b84990218910f1275e085e451aa7ea31e6023