Merge SPL-2020-03-05

Change-Id: Ic10ab96d37d1ea4276bcfb00ef93e5f0021c1ece