Merge SPL-2019-12-05

Change-Id: Idc80ce4b1d12589dcedb4c4cf1b0ca88d3676e0d