Merge SPL-2019-05-05

Change-Id: Ieacb9d2de59bdaa95f9dc5b7a2d2814470684b69