Merge SPL-2018-12-05

Change-Id: Ia8b01155429844b2feebe01543d905c87e9d006d