[automerger skipped] Merge SPL-2019-01-05 skipped: fdd4317564

Change-Id: I442f2887353d48e7a791f5b8d06b1575db632057