Merge SPL-2019-12-05

Change-Id: Ib61200fb1bb1f594f149b7c5cb2e5536a4c0975a