Merge SPL-2019-12-05

Change-Id: Ib59b5e0fcaeac87f04f493f5fee59ff419aebf8d
tree: 5571eb63a63aafe1b2507b4b002b369ca7684200
  1. srcs/
  2. OWNERS