[automerger skipped] Merge SPL-2019-12-05 skipped: 6cf2e8512d

Change-Id: I8b18aa20073da4978b2d76d1ef74ff6754597df2