Merge SPL-2019-02-05

Change-Id: I32756caafb6885368b29a7cd9d2f02e033f8bcec