[automerger skipped] Merge SPL-2019-12-05 skipped: a7f1c3cabf

Change-Id: Ifc3c7dea7a330ac89523b9a8cc5f7b4d060ac7fc