Merge SPL-2019-12-05

Change-Id: Ie35602b27392d6d2f49ba98cef489af627a7651b