[automerger skipped] Merge SPL-2020-06-05 skipped: eb51a0b18d

Change-Id: I67e8a9bfd0dacf2c72449e5a796b5017a56fe058