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

Change-Id: Id3b2134807408e672e2fae93fe2f292f952ecd3c