Merge SPL-2018-12-05

Change-Id: Ib83d8cbcbd09c991c955364bd53d8bc01be09ed5