Merge SPL-2019-04-05

Change-Id: Id950378ba03b10527afe34b3514b4f894c4569e0