Merge SPL-2019-05-05

Change-Id: I9caa4233a5a71fda3adde3fe7fdfa85d4c1ec90d