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

Change-Id: I93b89a35af4461e20c4b837e6252904420531db7