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

Change-Id: Ib8b1abbe272cc652b43b71dd338ad7e1ef31698f