[automerger skipped] Merge SPL-2018-12-05 skipped: 09ad3fd849

Change-Id: Ibc5683ad9cf894f11d9fad8fd4e86d6ec6721224