Merge SPL-2019-05-05

Change-Id: Ib7c2309bd8a67a1fa7b6df02ab1e2c595b8391c5