Merge SPL-2019-12-05

Change-Id: I1892fd41ad2ee67a9ceff5143c3f002971018f40