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

Change-Id: I690365287e1733b8fe1a6bfb71252c47b7e41d07