Merge SPL-2019-07-05

Change-Id: Ibec53f57b38fb5077a46a3c1131111dcd535f388