[automerger skipped] Merge SPL-2019-12-05 skipped: 9e5a23a500

Change-Id: I7c149a1a812d099913d85e7cbc4502148b6c6854