Merge SPL-2019-12-05

Change-Id: I9c272880302933d00ad8b710bd982fe328378496