Merge SPL-2019-07-05

Change-Id: Ic0390ac5b682f2bea6126567fb678f459c3ee7d6