[automerger skipped] Merge SPL-2019-12-05 skipped: 512169f017

Change-Id: If5c64f586d9f72e915d4415ee1fbe11364677171