[automerger skipped] Merge spl-2020-06-05 Change-Id: I1caf529f07eecc2b82ec1fae826059471e364d40 skipped: 25c701d0f6

Change-Id: I6eacea0b814a40c088fb44a5d056a122d0232a9d