Merge SPL-2019-02-05

Change-Id: I4ff3c4b5456b4440e9904a057685a629433b5d70